From 3de78decd41ff9785674d10940fdb7c62fa77b8c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 31 Oct 2015 19:10:52 -0400
Subject: [PATCH] Adwaita: Update frame styling

Adapt to the changes in the previous commit.
---
 gtk/theme/Adwaita/_common.scss           | 3 ++-
 gtk/theme/Adwaita/gtk-contained-dark.css | 6 +++++-
 gtk/theme/Adwaita/gtk-contained.css      | 6 +++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 7e9ccc2cb0..7108aed880 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2494,6 +2494,7 @@ GtkProgressBar {
 /**********
  * Frames *
  **********/
+frame,
 .frame {
   border: 1px solid $borders_color;
   &.flat { border-style: none; }
@@ -3437,7 +3438,7 @@ button.circular label {
   padding: 0;
 }
 
-.frame.keycap {
+frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index afa737cf35..4ed6f637a2 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3525,13 +3525,17 @@ GtkProgressBar {
 /**********
  * Frames *
  **********/
+frame,
 .frame {
   border: 1px solid #1c1f1f;
   padding: 0; }
+  frame.flat,
   .frame.flat {
     border-style: none; }
+  frame:backdrop,
   .frame:backdrop {
     border-color: #1f2222; }
+  frame.action-bar,
   .frame.action-bar {
     padding: 6px;
     border-width: 1px 0 0; }
@@ -4737,7 +4741,7 @@ button.circular label,
 .titlebar button.circular.titlebutton label {
   padding: 0; }
 
-.frame.keycap {
+frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 3aa59d3eb8..cee5a74a0f 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3687,13 +3687,17 @@ GtkProgressBar {
 /**********
  * Frames *
  **********/
+frame,
 .frame {
   border: 1px solid #a1a1a1;
   padding: 0; }
+  frame.flat,
   .frame.flat {
     border-style: none; }
+  frame:backdrop,
   .frame:backdrop {
     border-color: darkgray; }
+  frame.action-bar,
   .frame.action-bar {
     padding: 6px;
     border-width: 1px 0 0; }
@@ -4910,7 +4914,7 @@ button.circular label,
 .titlebar button.circular.titlebutton label {
   padding: 0; }
 
-.frame.keycap {
+frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;
-- 
2.30.2